Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Thu, 28 Jan 2010 07:06:13 +0000 (08:06 +0100)
committerJan D. <jan.h.d@swipnet.se>
Thu, 28 Jan 2010 07:06:13 +0000 (08:06 +0100)

Trivial merge